Cleand / Added some comments