Function rename
Some cleanup