Formatted files, minor changes