Code cleanup #2
Code cleanup #2