Updated/cleaned comments