Cleanup, comments, and a proper option type.