Further Code Improvements.