Code cleanup and language set fix