REFACTORING: Merge & removed comments