A few small tweaks and clean up