Clean up some extraneous parameters
Rearrange methods so they make a little bit of sense