Simplify some commands and docblock fixes