Cleaned Up Code, prep for content