Cleanup language, consistent JS