Code refactoring
More code refactoring
Code cleanup