Small formatting changes, detailed comments