Update - code cleanup, reduce the length to under 80