Rename variable
Cleanup function
Use uint8_t