More Cleanup

Cleaning up some imports, adding some comments