added 6.00 spring data and minor code cleanup