Fixed some formatting issues

We still need to add 'finally' clauses to the code.  That way the
connection problem will be fixed.