- Fix some code readable