Speed improvements and less code.