Code is a little prettier now