Clean up, add comments, update version