Fixed comments and space