Rearrange, add colons