Code cleaning, name convetion fixes, styling code