Refactor for great code quality justice