Changes according to review

Signed-off-by: IUnknown68 <arne@salsitasoft.com>