Reformatted output and rewritten generators for improved readability.