Reformatted Code and Optimised imports

More readable code