Updated comments and changed name of functions and aliases