Cleaning code
Didn't submit these files last time