Making things constant and refactoring code.