Refactoring
Code cleanup