Removed obsolete lines, added more comments