Simpler define/AMD indentation. Code clean-up.