cleaning up variable and method names