Change to comply with Checkcode style