Minor code refactor and added comments.
Merge remote-tracking branch 'origin/master'
Removed unused method and added comments.
Refactored code. Added more code comments.
Code refactor and formatting.
Formatted code.