This should fix yet another stack overflow and some general cleanup

Signed-off-by: Toon Schoenmakers <nighteyes1993@gmail.com>