Hiding things that don't need to be public and similar cleanup