Remove underscores from private vars