Style sources

@mourner Could you do a code review? See commit comments for details.