Linted changes and removed some debugging code.