cleaned the code base
Cleaned code base