Squash commits

Nicer history.