added note on code restructuring