Fix formatting.
Make some methods public.