minor changes to conform to Scala style guide
complete library separation