Added some minor changes, not worth to mention