Added missing method
Removed unneeded method
Replaced constants with static properties