Changing args around, and some cleanup