Refactor applications usage slightly