Revert "Revert "Commented and organized.""

This reverts commit 49cdd942e34d2b1e638b35144ab2a475edb7cc58.