Much refactorings, such simplified, wow.