Made some adjustments / improvements per @mattdbridges request