Small improvements according to meeting + formatting changes