Made some substantial cleanups. Will double-check extra credit now.