Refactor API for simplicity. More code but easier to read.