chore: misc formatting, comment fixes