Created better structure and is now less messy.