refactor: strong spec and explicit value assignment