Minor code cleanup (whitespace, import) merged-on-behalf-of: Petar Kirov <PetarKirov@users.noreply.github.com>