Changed visibility from public to package where possible