Commented and Refactored
Added Comments
Commented, bugfixing