Moved comments out into header
Refactoring