Refactoring before adding advanced UIViews.