Added some comments and cleaned up some imports