Limiting scale factor. Minor clean up.