Add version command and clean up command constructors