Refactoring: renaming, commenting, removing dead code
Merge