Set source and target version to 1.5 in pom.xml. A few minor clean ups.