Minor styling changes.  Cleaning up code a little