Sepparated runtime introspection from application context and general code cleanup