style fixes: re-arrange args of functions;