Line refactoring, optimization and changed min zoom.