Removed duplicated source
Temporarily removed main from cleaning
Code cleanup