Cleaned up
Made much mo simpler.