Re-order function signatures