Fix break lines and some minor changes