Refactor heleprs