Big clean up. Especially the source code.