Adding comments, moving some stuff to parameters