Cleanup project

We just need to be consistent with this policy. I also put the whole parenthetic statement on the next line. Look at this document: http://docs.scala-lang.org/style/declarations.html#function_values