Made the reccomended changes. Still a few more to go