making it better -- refactor to the rescue
to infinity
sometimes git frustrates me