Removed getters/setters, etc blah blah