Refactor Pry commands into commandset