Upadates per @Keno's feedback.