Refactored stuff.