Slight bit of cleanup to blocks and command descriptions