change some method names and variables for clarity