DocBlock and code cleanup