Made recommended changes