Added these to try and clean it up a little
Few changes made, very few. Will try and finnish soon