Simplified if statement
Removed/Added extension