added some emtpy lines, removed unused imports