fixed comments in lists
import cleanup