Clean imports

My first attempt to do anything in the IDE, so please be gentle!