cleaned up, moved to uint32_t only
cleaned up, moved to uint32_t only