Reordered imports to top + fixed indentation + changed versioning