first Code Cleanup