cleanup/rearrange
re-arrange for readability