clean code + add action