Removal of backslashes where not needed + small cosmetical changes.