Deleted some comments and set last spaces