A little bit more refactoring done.