[DF-2176] Fixed action cleanup
[DF-185] Code formatting