Cleaned more code

Cleaned more files