Pretty printing + small changes