Tidying up sources formatting