finished refractoring; last change: rental points