Refactoring/Reformat to spring repository