Refactor public/private methods