Removed unnecessary scanner, outsourced filename