Add additional commands and clean up for consistency in usage