CONN-1034: Formatting/clean-up and Spring/Hibernate prep