Cleanup + ability to interpret multiple files