Dev: Minor changes to reduce code size.

- This commit trims about 400 bytes off the min library size