indentation and reordering, orientated around files passed to main function