syntax cleanup, passing parameters