Remove uneeded use statements
Improve the output
Use filesystem for more
Stop passing the abstract into definitions