Fullfilling body of functions and changing/add comments