Adding comments, removing debugging code