get/set methods cleaned up