Cosmetics: moving the function definition around