It worked... some cleaning up

Cut the fat I wasn’t using.