Refactory make it more english