indentation, line breaks, comments and switch to Symfony filesystem