organize it a bit more