Clean up setters and getters