Refactoring renderer and point feature