Add some style fixes and remove TODO