Fixed indendations, added license header, changed int declaration to
Long and other minor updates.
Revert "Fixed indendations, added license header, changed int declaration to Long and other minor updates."

This reverts commit 5ca8924895f8c15f8d1144dd97b9d8c0d57ab287.
Fixed indentations, added license header, changed int declaration to
Long and other minor updates.