Fixing Style Cop issues