1. Update some naming 2. Seperate paint function