Minor optimizations

- Changed retain variables to strong