Removed unused or unneeded code, added some comments, removed some comments
Added more comments