Comment Cleanup

Cleaning up the function definitions