Moved the argument handling to a spot that made a bit more sense