Code cleanup

Moved all the constants to a Constants interface for better code
organization.