More major reformatting in line with PEP8

Also classified the loader so that we are instantiated for the very start