Speed improvements and tidyup