Real code cleanup

Having it back :-)