Removed bad assert. Renamed a function.