Adresses #73 - Did a little code clean up.