consoleton refactoring