improve code quality #2