removing @author tags
DRYed up code