More clean up & fix function call.