[BUGFIX] Updated to latest TypoScript Runtime
[CLEANUP] Improved the general structure