Mostly formatting.
Re-adjusted command registration.