I can kill the 3rd and 4th commit, they are rather cosmetical.