JavaDoc and removed unnecessary import