A bit more formatting, some arg name changes for consistency
contribute