Changes based on @mojombo's feedback