More delinting and added some missing object initialization.