Refactor: Remove atoms, use immutable data through methods.