Fix indentions

Some of the macros use tab, while the left use spaces, this patch
change it to always use the spaces. And a few aligning fixes.