refactoring, visual and performance tweaks
tweaks