Some house cleaning before reading/verifying code some more