Refactored hello world back into application