Refactorings to follow C naming convention
Commented out part delete