Cleanup

Some cleaning up and reworking the Profile creation according to https://github.com/link0/profiler/issues/9