removed vestigial code; improved consistency