Did a bit more code cleanup