formatting cleanups, removed unused import, deleted unused lines