Cleaned up Code, More Commenting