Refactor code; ImageHelper