Standardising
Remove fields
Moar fixing up
Fixing up bits
Fix for validation