style improved and wrong imports fixed