(#45) Fixed import ordering and removed unused imports