Change function's name and remove lame code