Little improvments and cleanups