Cleanup and add comments

g