Squashed all improvement commits into a single commit