Improve format
Improve installation the first time around