Another big clean up/add