[misc] Fix linting and layout nits