various formatting 'fixes' suggested by JSHint