Refactoring & improving xml doc comments