Remove some unneeded stuf
Fix indentation in aliases.