Made everything a little more implicit