Lil bit of code cleanup