refactoring

more stylish