Incorporated PR suggestions