Fixes
Code cleanup