Minor Code Improvements.