ML-36 Code Styling
Moved some some imports to top of file