Style guide and general cleanup