Added Comments
Code Clean-up
Refactor
Fixes