Cleaned up un-needed comments and spaces