Small tweaks
Small cleanup