Code Restructuration #part2

Function name in UpperCamelCase
Remove dead code / unused functions