improve code quality (constants, naming)