Changes as per review from cdburkard