WIP - further style proofing