Small tweaks

Code cleanup