fixed code quality