Tidy up
Store operations instead of configs