Clean up utility functions & model a bit