Cosmetics
Renders refactoring