Code style update in merging
This MR removes use of attribute/variable duplicates in merge part to ease looking for usage of attributes throughout the files + update/clean-up docstring. I do this as a standalone MR rather than mixing with new features.