Some nitpicking to stay consistent in everything