added command shortcuts, normalized whitespace