functions rename, clean up

Signed-off-by: Peter <pitzy@siteup.ro>