Mid refactor to reduce temporary variables
Simplified create logic
Tweaks