Some minor modifications made in class