Minor Refactor (WIP)