Codecleanup. Rearranged and did &-references according to the good way.