Cleaned up connection/resultset classes