Refactor XD

duh duh