Final Code Clean-up
Untracked files