organized it a bit better