Cleaned up the structure a bit so i dont mess it up