Coding Style & Comprehensibility
Cleanup duplicates