Clean up

Move some arguments to a second line, remove unused variables