Refactor console with new helpers