Cleanup the formatting
Add scalactic and code highlighting