Various refactorings and @var description now counts for property