Addressed ScalaStyle issues