Minor changes. Some whitespace, some comments and removing a remaining -1.0