Updated code. Visually and refactoring.