Refactored run console