Replace constants with more descriptive names