Cleaned all code

FIX