Refactor, added LogHelper WIP