Better comments, scopes cleanup on overflow