develop v.41 - cleaning up code