Also there is mixing of symbols and strings in keys. Let's be consistent.