More tidy/speed ups