my last commit

Cleaned up the code according to codenarc results, removed violations.
we have 81 % code coverage but even with all the tests I wrote tonight,
we still have about 45 % code coverage on branches. Please add more
tests if you can. I have to study for SFS