Just some spaces removed and comments added