Remove superfluous compatibility macro
Fix indentation