Fixed the constants declaration and removed unnecessary utility methods