fixed code quality issues