Meet coding standards
Refactor when we chose to extend things.