Cleaned up import lines to follow code style guide