unnecessary class omitted and imports organized