Initial revision
Use more helpful names in functions