Some minor refactoring, hiding methods