refactor constants, methods