Updated comments.
Removed test code styles.
Updated class names.
Recompiled.
Updated.