Cleaning header & organizing contronllers order