Code cleanup, indentationfixes and removed spaces...