Just some cleanup/small enhancements.