small tweaks and cleanup
small tweaks and cleanup