formatting + imports cleanup