Refactoring for justice and readability