work in progress > clean