cleanup & enhancements