Fixed formatting
Improved printing