Cleanup / enhancements