Added some testing fields and removed excess whitespace