Comments cleanup
More comments