Some cleanup in the controls section