Minor cleanup of WIP