[UPDATE] Cleanup and language