General readability refactoring