Some clean up and tweaks