CLN: Clean up indentation
CMP: Still triny to fix compatability ...