general cleanup - proper param/var names, etc
renamed BlockUnstable to UnstableBlock