[Fix] Improving some code