organize properly