Dusting the code a little bit