Removed magic numbers from main controller