Move functions in the correct section (100% cosmetic)
Run services checks only when necessary