made code friendlier to look at hopefully