Code cleanup: reduced visibility