More code enhancements. #89