better variable naming and even more comments