Simple Codecleanup and preparation for next Release