small Code Cleanup