Did more refactorings.