Moved getter/setter methods to the bottom of the file