Cleaning Up Code

New New Updates