Made filename generating function and improved make spotless