Did some minor editing in main