Simplify single-use variables
Minor relocation in services startup