WIP - minor code cleanup