Merge "Changing position of colon for consistency"