Refactoring
Fixes
Code cleanup
Cleanup