Pullrequest: Code Cleanup