Refractoring and @author tags.