Fixes and moving methods into helper.

Signed-off-by: Yuri Tomanek <yuri@tomanek.com.au>