Some clean-up
Adjustments to new functions names
Adjustments to formmating and identing