Review and cleanup the codebase

[jcechace]

Might be a good idea to cleanup the codebase a bit (since there are still some leftovers from back then) before we decide if/how we make it more public.

Assigning to everyone since all of us should have a look