Remove unnecessary nil checks, clearer mutable dictionary initialization