committing on behalf of @MStevens604: Added comments and cleaned up constructor calls.