Clean up code with accessors