redo + style fix