Slight improvements. Thx @catwell ;)