#436 - Slight cleanup