Thanks everyone for the input. I managed to refractor a unit with source code 1600 lines down to 677 lines by splitting to multiple classes. ;-) Regards Have a nice day Regards Leigh