Cleanup private variables and methods

Private variables and methods should have _ suffix