Remove some unused cruft
Indentation fixes
Fix bash autocompletion