Add comments, clean style