Cleaned up a couple imports and unused declarations/variables
Added a couple comments