Eliminate length-calculations, minor cleanups