Cleanup whitespace
Get rid of goto statement