improve structure by adding functions

the old code was just plain spaghetti. With introduction of functions we get a better structure even though there is still room vor improvement.

There is no functional change in here just a restructuring.