Fixed some style issues and passed all the tests