[Issue#202] code cleanup