Fixes code quality issues