change keys to atoms

I think atoms looks cleaner