Move constants to its own class
Moved more constants to its own class
Even more extract class on constants
General code clean up