Clean up get methods

Returns variable rather than checking state in if statement