Replace dangling underscores with private vars and methods