Cleanup + style fixes