Very small changes, no change in functionality
Cleaning up imports