Addressed Matt's comments
To be consistent I changed a few `def` for `val` and removed two println