organization and aesthetic tweaks