Future enhancements section and clean-up.