Updating new files

Refactored and commented files