Slight cleanup. Only aesthetics