clean code and some format