Refactoring, removing package and trait, using lazy vals.