Added tweaks and clean up