UPDATE
REFACTOR. Code formatting