Made recommended changes removed short timeout added returns and other small changes