Fixed issue by changing order options are written and verified. Some whitespace changes due to renaming a method