Cleanup
Consolidating size option for field types