Clean up passing of arguments