Did some housecleaning. Made some stuff a bit more private