refactoring
beautification