More stylistic improvements
Improve machine info