Cleaner dictionary population.
Beautiful code ;___; will never do Java again.