Whitespace change
Rename variable
Validation is now implemented in core