Small fixes, tidy and shorter lines