Refactor for simplicity - no API or build dependancies