Cleaned up Params.scala