clean code and fix usage
clean code