improved readability

Combined most commands into single lines for (arguably) better readability