Code cleanup and a bit of renameing. Prepairing for release 0.4