Another Codecleanup Pullrequest