project files amended
Refactored code