Added comments, removed huge comment block