fixed helpers calling issue, yah!
cleaned the code