6:42 refactored commands a little