more visual tweaks and old code removal