Add comments and clean up a tiny bit