Fixed code quality