Adding comments, formatting changes