Add comments, cleanup