I'll try and optimise is later but for now all unnecessary blocks have been deleted so no changes just satisfying
