Cleaned up some unnecessary get/set methods