Cleanup/add comments