Refactored Application to have only one level indent.