Reindented and reformatted sourcecode