Improved code style of controlcolidate