make import line less than 80 chars
remove unnecessary variable null definitions