Cosmetic changes, hidded unnecessary controls