Command list and better formatting