Remove redundant language pragmas
Minor refactoring