Remove tabs and reformat code
Rename MA files