Commented Dictionary class and optimized a few variables