Added space and other changes according to comments