Added more comments and removed unneded ones