Code cleanup for reliable dictionary