restructure/refactor
indent