some cleanups
renamed some struct