Formatting sources. Small fixes.