Clean code, add comments, more examples