Cleaned up JDBC code