Fixed: more trailing spaces
Fixed: some more Checksytle things