Refactor methods visibility a bit.