Clean up FileUtils
Add to Maths constructor