Minor clean-up + take arguments