Add DocBlock and rename methods