Refactoring

Also changed IsPointInside method.