MINOR: Updates to class file static visibility etc.
MINOR: Change config setup.