Okay, done refactoring now. Promise.