Refactoryin code quality