Remove underscores from functions