Cleaned up all getter/setter pairs