The correct syntax was used for the if/else.  Some cleanup was done.