small code layout refactor (more correct)