Code Review pull request

Think about spacing, and be consistent.