Refactored: nothing serious.