Tightening-up list of commands