Just needs a little code cleanup