Fix formatting, general presentation