Initial pass at prettifying some commands