removed an unneeded include and cleaned code some