refactoring and little visual changes