Updating @author tag.
Code cleanup.