Updates to method naming and commenting