Refactoring and making things more clear.