Better style consistency