Updated old language format to properties fromat
Code cleanup