Minor formatting to Commands