Removed old commented out stuff, changed "domain of discourse", cf. #128