Let's do some tidying up e.g. JDBC