refactoring and short cleanup