style: cleanup

there are a few fixes, I'll put inline comments to indicate them