Minor clean-ups and identified todos