Visual tweaks
cleanup