Cleaned out imports per advice from omarkj and ypaq.

Some spacing stuff that was bugging me as well.