Refactored common extensions out of each file