CS fixes

Always have an empty line before docblocks