Code cleanup #1
Code cleanup #1