Comply with convention

Changed name of arguments and added return type