Made small enhancements