some method and variable name improvements