Refactored a bit
Removed unn file