Polish and add aliases for functions-files
Remove redundant require
Remove redundant alias