Init. added repetition
Removed not used helpers