Refactoring and visual changes