Made classes look cleaner