Refactor

Useful Update;