Remove line noise
Small tweaks