annotation loop break instead of continue, some redundancy removals, more comments, unused variables removed, lint shut up