Add body of functions and comments