Restored lost file.
Code clean up.