clean code and fix