Refactored Console