Modify code to comply with strict standards