Address #54.
Code clean up.