Death formatting and better handling of the command.
Signed-off-by: Chris Sanders <zidane@outlook.com>