Code cleanup Service class