Simple refactoring; renaming and pragma markings.