Make structure of source nearer to style guide