Improving indent in source files and readjusting and filling arrays in report