Cleanup code by using enums instead of Constant strings