Reformatted code (some old files had even tabulator indents..)