minor updates cleaning of drawSelf()