Tidied up the fill a bit

Moved all imports to the top and just made it a little bit neater