Adding XML comments to configuration methods + slight refactoring