Trim

Changed fields and methods to simplify the class.