Cleanup

I can reformat this however would make it easier to review.