reorder some includes
rename variables