Clean up paths, variables and option for mkdir