Lint
Formatting + lint
Format empty strings as (empty string)
Test cleanup