Moved some things for organization.
Added a comment.
Merge remote-tracking branch 'origin/master'