removed some white spaces and comments