Additional cleanup and noting ideas for new features