[#438] more simple and cleaner code

still have not figured out how to fix it property for Firefox ! to be
continued… tomorrow ;)