#136 cleanup of the code