Cleaned up the logger in commands