Refactored to presentable state.