Updated to better reflect my current coding style.