Remove unused import, fixed formatting in builder