ordering of imports changed to match python best practices