Constants, comments, and code refactoring