refactor recorder commands