Crushing a bit more

Refactoring to save space
More compacting

Squashing it down.