Code cleanup / lots more options.