Code cleaning, limit changes