More julia cleanup and coversion