fix indents and cleanups
merging changes for languages