refactoring
Few more tweaks