clean up as recommended by @RaymondLim