Titdy up and add more comments