more cleanups
removed cast
fixed fudge part build
more cleanups
more cleanups
more cleanups

Signed-off-by: Jens Nyberg <jens.nyberg@gmail.com>