cleanup & tweaks
gimme some love