Organizing some of the mess