Removing comments and rename functions