addressed @martijnvg comments thx!