make functions clean