removing where from required fields and formating code