Boosted code coverage to 90% from 46%
Code formatted