Refatoring
Improve the style