spring code cleanup