Cleaning things up, using new fold style...