Minor refactoring. Stable.