Improve method names in Surrogate operations
Remove rare but redundant comments
Rename self variable in Surrogate for clarity
Improve readability