Modified to clean up imports and also got rid of serialised thingy storage format
Cleaning up a bit