code cleanup, added initialization for variables without explicit initializer
fixed CFG generation