Code restructuring
Code optmization