Message: Removed some code duplication