Cleanup on syntax and files