Refactoring and name changes
Refactoring / performance
Code cleanup