Cosmetics: change function order