Introduced TapPointAdapter. Refactorings.