Moved file name to seperate line in the code hot spots so it's easier to read