constant class
comments and refactoring