Just moved out of the blocks some code and tagged with pragma class sections
Closes #10
Minor refactoring