Changed more types to either size_t or uint when appropriate. Changed private class member naming convention