pH-7 Cleanup readability of the form request validation