Cleaned up imports, replaced useless Store class with object.