Removed leading underscores from variables/methods