Just some minor stuff, moving lines around, removing debugging output, etc.