Sticking to conventions a little better