ScalaStyle Correction + Removed magicnumber rule + Added Jona's changes: TDD, Refactor