Halfway through code cleanup
small code cleanup
merge commit