Some typos and visibility optimizations