Uses "ACTIONS" keys instead of datastore options

It's better to use ACTIONS instead of datastore in this case. Also,
did some cleanup.