More lint and formatting