small tweaks and cleans