Very minor code cleanup.
Cleaned up the code for clarity.  Changed file and class names too.