organize a bit better