improve Helper class