cleaning things up, implementing new fold style...