Edited files for conciseness