Remove underscore from private class members and methods