Can you refactor to not use underscores for properties or methods so that it's consistent with all of the other code?