small Application refactor