Beautification for command code