code fixes
Code cleanup