moved to default package and minor commenting