Refactored application config to make it more readable