Merge "Reorder code to be consistent accross branches"