Refactored and simplified names