Slight bit of cleanup