Fixed labels
Code cleanup and bad example added