Code Refactore
By @roham navidi