Code Cleanup and languages added