Updated spacing issues, and fixed some items in the FileSystemLoader Class

Updated from previous pull request