cleaned up the code FK code a ton