cleaned up some code, removed redundant methods and improved some constant names across the codebase